from trunk
authorKenichi Handa <handa@m17n.org>
Tue, 16 Feb 2010 01:48:51 +0000 (10:48 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 16 Feb 2010 01:48:51 +0000 (10:48 +0900)

Trivial merge